Code

Cmake: minor fixes