Fix fetch/update handles

Change-Id: If7d4e270671da5eefcefeb42fb3efe2d4e31dc43