- some cleanup and CMake fixes for WIN64