and some more fixes