vrevoke/single-user - fix more revoke issues.