Misc update system fixes