Minor changes with the use of cmake