Fix bootstrap for production