Fix labels and error messages

Change-Id: Iadb96aeb08f0b6c13d73444829aa7bf8a5a943b3