Fix alignment of some unions