Integrate fixes