Small fixes for CMake modules/libraries.