More alignment tweaks