minor fixes2