Update cmakes
Fix cmake
Fix issues with paths