Making small changes in Common's cmake.