Label alignment fixes after 9d3ee73d85e2e8d08dcd6945860746887a55f048