Fixes for backup gem