Fixes for ROOT-5755 (CMake)