Pushed a variety of update-related fixes.