A couple of cmake fixes.