Minor CMake fixes for building on Linux