some more fixes
more fixes