Cleanup labels + small fixes