CMake cleanups and fixes #4