Made some more fixes..