OSX 32-bit fixes. Our ALIGN() macro clashed with something on OSX.