Port Squash; Fix backup/restore issues.