A few more changes to authorization