Fix problems with labels