Some CMakeList edits