minor fixes
more fixes