Minor cmake_modules changes for compilation on Linux/MacOS