minor fixes - still have occasional object conflict