Continuing fixes for Update controller