Fix ordering of updates