Yet more fail32 fixes...