diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
index e09b38d..5460c58 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -116,15 +116,15 @@ public class FhirServerConfigCommon {
     // Subscriptions are enabled by channel type
     if (HapiProperties.getSubscriptionRestHookEnabled()) {
       ourLog.info("Enabling REST-hook subscriptions");
-      retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.RESTHOOK);
+      retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.RESTHOOK);
     }
     if (HapiProperties.getSubscriptionEmailEnabled()) {
       ourLog.info("Enabling email subscriptions");
-      retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.EMAIL);
+      retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.EMAIL);
     }
     if (HapiProperties.getSubscriptionWebsocketEnabled()) {
       ourLog.info("Enabling websocket subscriptions");
-      retVal.addSupportedSubscriptionType(Subscription.SubscriptionChannelType.WEBSOCKET);
+      retVal.addSupportedSubscriptionType(org.hl7.fhir.dstu2.model.Subscription.SubscriptionChannelType.WEBSOCKET);
     }
 
     retVal.setFilterParameterEnabled(HapiProperties.getFilterSearchEnabled());
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
index 6bba74d..fe321f3 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
@@ -126,21 +126,21 @@ public class JpaRestfulServer extends RestfulServer {
       if (fhirVersion == FhirVersionEnum.DSTU3) {
         IFhirSystemDao<Bundle, Meta> systemDao = appCtx.getBean("mySystemDaoDstu3", IFhirSystemDao.class);
         JpaConformanceProviderDstu3 confProvider = new JpaConformanceProviderDstu3(this, systemDao, daoConfig, searchParamRegistry);
-      confProvider.setImplementationDescription("HAPI FHIR DSTU3 Server");
-      setServerConformanceProvider(confProvider);
-    } else if (fhirVersion == FhirVersionEnum.R4) {
+        confProvider.setImplementationDescription("HAPI FHIR DSTU3 Server");
+        setServerConformanceProvider(confProvider);
+      } else if (fhirVersion == FhirVersionEnum.R4) {
         IFhirSystemDao<org.hl7.fhir.r4.model.Bundle, org.hl7.fhir.r4.model.Meta> systemDao = appCtx.getBean("mySystemDaoR4", IFhirSystemDao.class);
         JpaConformanceProviderR4 confProvider = new JpaConformanceProviderR4(this, systemDao, daoConfig, searchParamRegistry);
-      confProvider.setImplementationDescription("HAPI FHIR R4 Server");
-      setServerConformanceProvider(confProvider);
-    } else if (fhirVersion == FhirVersionEnum.R5) {
+        confProvider.setImplementationDescription("HAPI FHIR R4 Server");
+        setServerConformanceProvider(confProvider);
+      } else if (fhirVersion == FhirVersionEnum.R5) {
         IFhirSystemDao<org.hl7.fhir.r5.model.Bundle, org.hl7.fhir.r5.model.Meta> systemDao = appCtx.getBean("mySystemDaoR5", IFhirSystemDao.class);
         JpaConformanceProviderR5 confProvider = new JpaConformanceProviderR5(this, systemDao, daoConfig, searchParamRegistry);
-      confProvider.setImplementationDescription("HAPI FHIR R5 Server");
-      setServerConformanceProvider(confProvider);
-    } else {
-      throw new IllegalStateException();
-    }
+        confProvider.setImplementationDescription("HAPI FHIR R5 Server");
+        setServerConformanceProvider(confProvider);
+      } else {
+        throw new IllegalStateException();
+      }
     }
 
     /*
@@ -327,6 +327,6 @@ public class JpaRestfulServer extends RestfulServer {
       partitionSettings.setAllowReferencesAcrossPartitions(mode);
       partitionSettings.setIncludePartitionInSearchHashes(HapiProperties.getIncludePartitionInSearchHashes());
       registerProvider(appCtx.getBean(PartitionManagementProvider.class));
-    }
+  }
   }
 }