Again some more fixes