Revoke access - fixed issues