Cosmetic fixes to main file
CMake issues fixed

The problem was caused by the unnecessary use of quotes around a
variable.