Labels applied
More fixes