Fixes for update