More fixes, label formatting