More fail32 fixes...