Small fixes on labels