Improvements to deal with occasional #94 control