Merge branch 'fixes' into next

This contains a few must have fixes, like the stack alignment one.