Untested fixes to the CMake build files
Bump version to 0.8.4