some more fixes
some more fixes