Fix cmake 3.0 issues