Some changes to update didn't make it into the last commit