Forgot to handle SecurityScope None in a few cases