Some alignment tweaks