Stability fixes

aka idiotproofing