Fixed some things Visual C++ 2008 weren't happy with