Changes to cmake