CMake Changes for Windows compilation