More fixes to x32 build config