Fix more angular update scope breakage