A few tags were incorrect since the last changes. This corrects it. (cherry picked from commit 1ea0fe29)