Attempt to fix some Fairwick spy watch bugs