Fixes to update