diff --git a/build.gradle b/build.gradle
index 77d20eba..b7a8ae09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:15.0'
+    compile 'com.graphql-java:graphql-java:16.2'
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'
diff --git a/src/main/java/graphql/annotations/strategies/EnhancedExecutionStrategy.java b/src/main/java/graphql/annotations/strategies/EnhancedExecutionStrategy.java
index 66b86f80..465ff79d 100644
--- a/src/main/java/graphql/annotations/strategies/EnhancedExecutionStrategy.java
+++ b/src/main/java/graphql/annotations/strategies/EnhancedExecutionStrategy.java
@@ -54,7 +54,6 @@ protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext execu
 
             ExecutionStepInfo fieldTypeInfo = ExecutionStepInfo.newExecutionStepInfo().type(fieldDef.getType()).parentInfo(parameters.getExecutionStepInfo()).build();
             ExecutionStrategyParameters newParameters = ExecutionStrategyParameters.newParameters()
-                    .arguments(parameters.getArguments())
                     .fields(parameters.getFields())
                     .nonNullFieldValidator(parameters.getNonNullFieldValidator())
                     .executionStepInfo(fieldTypeInfo)
@@ -88,7 +87,6 @@ protected FieldValueInfo completeValue(ExecutionContext executionContext, Execut
      */
     private ExecutionStrategyParameters withSource(ExecutionStrategyParameters parameters, Object source) {
         return ExecutionStrategyParameters.newParameters()
-                .arguments(parameters.getArguments())
                 .fields(parameters.getFields())
                 .nonNullFieldValidator(parameters.getNonNullFieldValidator())
                 .executionStepInfo(parameters.getExecutionStepInfo())
diff --git a/src/test/java/graphql/annotations/AnnotationsSchemaCreatorTest.java b/src/test/java/graphql/annotations/AnnotationsSchemaCreatorTest.java
index 8b8bcc57..7e98c3f9 100644
--- a/src/test/java/graphql/annotations/AnnotationsSchemaCreatorTest.java
+++ b/src/test/java/graphql/annotations/AnnotationsSchemaCreatorTest.java
@@ -220,6 +220,7 @@ public void build_directive_UsingDirectivesContainer_schemaIsCreatedWithDirectiv
 
     @GraphQLName("additional")
     public static class AdditionalTypeTest {
+        @GraphQLField
         public int getI() {
             return 4;
         }
diff --git a/src/test/java/graphql/annotations/GraphQLExtensionsTest.java b/src/test/java/graphql/annotations/GraphQLExtensionsTest.java
index 8eedc418..6f2f663f 100644
--- a/src/test/java/graphql/annotations/GraphQLExtensionsTest.java
+++ b/src/test/java/graphql/annotations/GraphQLExtensionsTest.java
@@ -20,6 +20,7 @@
 import graphql.annotations.processor.GraphQLAnnotations;
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
 import graphql.annotations.processor.retrievers.GraphQLObjectHandler;
+import graphql.com.google.common.collect.ImmutableList;
 import graphql.schema.*;
 import org.testng.annotations.Test;
 
@@ -103,7 +104,7 @@ public void fields() {
         List<GraphQLFieldDefinition> fields = object.getFieldDefinitions();
         assertEquals(fields.size(), 5);
 
-        fields.sort(Comparator.comparing(GraphQLFieldDefinition::getName));
+        fields = ImmutableList.sortedCopyOf(Comparator.comparing(GraphQLFieldDefinition::getName), fields);
 
         assertEquals(fields.get(0).getName(), "field");
         assertEquals(fields.get(1).getName(), "field2");
diff --git a/src/test/java/graphql/annotations/GraphQLObjectTest.java b/src/test/java/graphql/annotations/GraphQLObjectTest.java
index d3893a7d..299a64d8 100644
--- a/src/test/java/graphql/annotations/GraphQLObjectTest.java
+++ b/src/test/java/graphql/annotations/GraphQLObjectTest.java
@@ -28,6 +28,7 @@
 import graphql.annotations.processor.typeBuilders.InputObjectBuilder;
 import graphql.annotations.processor.typeFunctions.TypeFunction;
 import graphql.annotations.processor.util.CodeRegistryUtil;
+import graphql.com.google.common.collect.ImmutableList;
 import graphql.schema.*;
 import graphql.schema.GraphQLType;
 import graphql.schema.idl.SchemaParser;
@@ -275,7 +276,7 @@ public void fields() {
         List<GraphQLFieldDefinition> fields = object.getFieldDefinitions();
         assertEquals(fields.size(), 8);
 
-        fields.sort((o1, o2) -> o1.getName().compareTo(o2.getName()));
+        fields = ImmutableList.sortedCopyOf((o1, o2) -> o1.getName().compareTo(o2.getName()), fields);
 
         assertEquals(fields.get(2).getName(), "field0");
         assertEquals(fields.get(2).getDescription(), "field");
@@ -407,7 +408,7 @@ public void accessors() {
         GraphQLObjectType object = this.graphQLAnnotations.object(TestAccessors.class);
         List<GraphQLFieldDefinition> fields = object.getFieldDefinitions();
         assertEquals(fields.size(), 2);
-        fields.sort(Comparator.comparing(GraphQLFieldDefinition::getName));
+        fields = ImmutableList.sortedCopyOf(Comparator.comparing(GraphQLFieldDefinition::getName), fields);
 
         assertEquals(fields.get(0).getName(), "getValue");
         assertEquals(fields.get(1).getName(), "setAnotherValue");