Bug fixes to labels