Minior fixes to the updating