Bug fixes for Update.