some more fixes5