fix a few issues regarding cmake refactoring