Bug fixes for new label