fixes to make sure all modes run w/o problems when no object editing happens