Some backup fixes, still broken