Fix backup retention logic, etc.