minor cmake fixes