Change $watches to be 1.2.x compatible