Some fixes to cmake-files