Fixed more stuff

Quite a descriptive commit message, eh? It's just been a day of GREAT commit messages here....