x32 fixes