fix some more problems with the new label stuff (as for code review)