Yet more backup tweaks