Update: fixes to a few rare glitches