Minor clean-up.
Fixed some update problems