Cleanups, fixes project for ws2012