Fix more labels

Change-Id: Ib59dd0e170d446a850e9315ba41df46e969b3348