more fixes for update