diff --git a/hapi-fhir-android/dependency-reduced-pom.xml b/hapi-fhir-android/dependency-reduced-pom.xml
index 75c68235a10..1e0c0d8a940 100644
--- a/hapi-fhir-android/dependency-reduced-pom.xml
+++ b/hapi-fhir-android/dependency-reduced-pom.xml
@@ -94,7 +94,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.5.3</version>
+            <version>${maven_assembly_plugin_version}</version>
             <executions>
               <execution>
                 <phase>package</phase>
@@ -104,8 +104,8 @@
                 <configuration>
                   <attach>true</attach>
                   <descriptors>
-                    <descriptor>/Users/t3903uhn/git/hapi-fhir/hapi-fhir-android/src/assembly/android-sources.xml</descriptor>
-                    <descriptor>/Users/t3903uhn/git/hapi-fhir/hapi-fhir-android/src/assembly/android-javadoc.xml</descriptor>
+                    <descriptor>${project.basedir}/src/assembly/android-sources.xml</descriptor>
+                    <descriptor>${project.basedir}/src/assembly/android-javadoc.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/ClientInvocationHandlerFactory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/ClientInvocationHandlerFactory.java
index cbc9173406c..2ae753e971b 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/ClientInvocationHandlerFactory.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/ClientInvocationHandlerFactory.java
@@ -52,7 +52,7 @@ class ClientInvocationHandlerFactory {
 			myMethodToReturnValue.put(theClientType.getMethod("getServerBase"), theUrlBase);
 
 			myMethodToLambda.put(theClientType.getMethod("setEncoding", EncodingEnum.class), new SetEncodingLambda());
-			myMethodToLambda.put(theClientType.getMethod("setPrettyPrint", boolean.class), new SetPrettyPrintLambda());
+			myMethodToLambda.put(theClientType.getMethod("setPrettyPrint", Boolean.class), new SetPrettyPrintLambda());
 			myMethodToLambda.put(theClientType.getMethod("registerInterceptor", IClientInterceptor.class), new RegisterInterceptorLambda());
 			myMethodToLambda.put(theClientType.getMethod("unregisterInterceptor", IClientInterceptor.class), new UnregisterInterceptorLambda());