Fixes for _M_GENERIC build

Windows doesn't have this option, right?
Alignment!