Fixes for issues in incremental backups with multiple containers