Fixes to the update