Fixed a number of compiler warnings and updated the windows project to reflect the latest changes