More fixes of auto backup