More update tweaks