Several authorization fixes