These changes seem to fix the linux32 build (for real)