Integrating fixes