final fixes for update