Small changes to authz

Based on suggestions from @Vagabond