Bocian backup fixes