CMake fixes and one changed method signature