some fixes

collection of local patches
There is a space between `string` and `(`, while the rest of the CMake file doesn't have one there. Minor thing I noticed while reading though the changes.