Correct errors causing some updates to be ignored.

Change-Id: I0e63e84c5d62f1ed61283343605300c3aa69fe38