Some fixup on stack alignment