Bugfixes

I hope I don't ruin the fun for everyone else, I had nothing to do :P.