First primary/backup fixes