More X32 fixes.