alignment fixes for 32-bit builds