Various alignment tweaks