Post-demonware tweaks