some cmake fixes