fix some issues with label placement