Quick fixes.

I bet KingCreeperEli was in hurry, because when I updated my repository with his changes. I got some errors with his changes. Anyway, here are the fixes for them.