Minor cmake fixes