* Fixed label issues