minor fixes to updateClient and updateFarm
resolved conflict