diff --git a/uma-server-webapp/src/main/webapp/WEB-INF/application-context.xml b/uma-server-webapp/src/main/webapp/WEB-INF/application-context.xml
index 02c7db60c..3d689e445 100644
--- a/uma-server-webapp/src/main/webapp/WEB-INF/application-context.xml
+++ b/uma-server-webapp/src/main/webapp/WEB-INF/application-context.xml
@@ -131,12 +131,6 @@
 		<security:expression-handler ref="oauthWebExpressionHandler" />
 	</security:http>
 	
-	<security:http pattern="/#{T(org.mitre.uma.web.AuthorizationRequestEndpoint).URL}/**" use-expressions="true" entry-point-ref="oauthAuthenticationEntryPoint" create-session="never">
-		<security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" />
-		<security:custom-filter ref="corsFilter" after="SECURITY_CONTEXT_FILTER" />
-		<security:expression-handler ref="oauthWebExpressionHandler" />
-	</security:http>
-
 	<security:http pattern="/#{T(org.mitre.openid.connect.web.UserInfoEndpoint).URL}**" use-expressions="true" entry-point-ref="oauthAuthenticationEntryPoint" create-session="stateless">
 		<security:custom-filter ref="resourceServerFilter" before="PRE_AUTH_FILTER" />
 		<security:custom-filter ref="corsFilter" after="SECURITY_CONTEXT_FILTER" />
diff --git a/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java b/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
index eb02f8a79..27fff1366 100644
--- a/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
+++ b/uma-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
@@ -65,7 +65,7 @@ public class ResourceSetRegistrationEndpoint {
 
 	private static final Logger logger = LoggerFactory.getLogger(ResourceSetRegistrationEndpoint.class);
 
-	public static final String URL = "/resource_set";
+	public static final String URL = "resource_set";
 
 	@Autowired
 	private ResourceSetService resourceSetService;
@@ -280,7 +280,7 @@ public class ResourceSetRegistrationEndpoint {
 				rs.setName(getAsString(o, "name"));
 				rs.setIconUri(getAsString(o, "icon_uri"));
 				rs.setType(getAsString(o, "type"));
-				rs.setScopes(getAsStringSet(o, "scopes"));
+				rs.setScopes(getAsStringSet(o, "resource_set_scopes"));
 				rs.setUri(getAsString(o, "uri"));
 
 				return rs;
diff --git a/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java b/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java
index e9a482191..68b37e92c 100644
--- a/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java
+++ b/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java
@@ -54,10 +54,8 @@ public class UmaDiscoveryEndpoint {
 
 		m.put("issuer", issuer);
 		m.put("pat_profiles_supported", tokenProfiles);
-		m.put("aat_profiles_supported", tokenProfiles);
 		m.put("rpt_profiles_supported", tokenProfiles);
 		m.put("pat_grant_types_supported", grantTypes);
-		m.put("aat_grant_types_supported", grantTypes);
 		m.put("claim_token_profiles_supported", ImmutableSet.of());
 		m.put("uma_profiles_supported", ImmutableSet.of());
 		m.put("registration_endpoint", issuer + DynamicClientRegistrationEndpoint.URL);