Fix some align problems