some more fixes

fixes