Minor changes to fix the CMake builds for latest Axel's push.