general fixes for authz