Some cmake fixes required for install-space