Further tweaks / corrections to UPDATE functionality