More too hot breaking time fixes.