more fixes

some more fixes..