And some more fixes