Integrate surface application fixes