Align types again