Fixed authorization issues