Minor fixes,  update method change