Fixed compile warnings
Cmake cleanup