Cleanup MFA sandbox bugs.