Integrate and fix minor error.