minor fixes
more minor fixes