Made some more fixes