More fixups for update