Fix permission denial NameError
Merge branch 'canary'