Fix CMakeLists.txt files
Various fix due to code copy/paste