Minor cmake changes