More 0 downtime tweaks