CmakeLists adjustments so Windows is better supported