more cmake fixes