Backup pruning, minor fixes