Update to work with latest sloth-cmake