Just some more fixes