Cmake fixes for windows build