Make CMake 2.8.7 compatible
Cosmetic changes