Some quick fixes to cmake