diff --git a/build.gradle b/build.gradle
index 4e731ea..db5a00a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ group = 'net.wasdev.sample'
 version = '1.0-SNAPSHOT'
 description = "PlantsByWebSphere"
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
@@ -30,8 +30,10 @@ configurations {
 
 dependencies {
 	providedCompile 'javax:javaee-api:7.0'
+	compile 'xalan:xalan:2.7.2'
+	compile 'xalan:serializer:2.7.2'
 	serverLibs  'org.apache.derby:derby:10.11.1.1'
-	libertyRuntime 'com.ibm.websphere.appserver.runtime:wlp-javaee7:19.0.0.8'
+	libertyRuntime 'io.openliberty:openliberty-runtime:18.0.0.2'
 }
 
 task copyServerLibs(type: Copy) {
diff --git a/src/main/java/com/ibm/websphere/samples/pbw/bean/ResetDBBean.java b/src/main/java/com/ibm/websphere/samples/pbw/bean/ResetDBBean.java
index 41e4af0..678a95c 100755
--- a/src/main/java/com/ibm/websphere/samples/pbw/bean/ResetDBBean.java
+++ b/src/main/java/com/ibm/websphere/samples/pbw/bean/ResetDBBean.java
@@ -259,6 +259,15 @@ public void populateDB() {
 		Util.debug("Populating BACKORDER table with default values...");
 		try {
 			String[] values = Util.getProperties("backorder");
+			if (values != null && values.length != 0) {
+				if (values[0] == null || values[0].isEmpty()) {
+					Util.debug("No BACKORDER properties found.");
+					return;
+				}
+			} else if (values == null || values.length == 0) {
+				Util.debug("No BACKORDER properties found.");
+				return;
+			}
 			Util.debug("Found BACKORDER properties:  " + values[0]);
 			// Inserting backorders
 			for (int index = 0; index < values.length; index++) {
diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
index 7288548..075696e 100644
--- a/src/main/liberty/config/server.xml
+++ b/src/main/liberty/config/server.xml
@@ -19,7 +19,7 @@
                   
     <!-- Automatically expand WAR files and EAR files -->
     <applicationManager autoExpand="true"/>
-
+    <logging hideMessage="SRVE9967W" />
     <variable name="WAS_INSTALL_ROOT" value="${server.config.dir}"/>
     <variable name="DERBY_JDBC_DRIVER_PATH" value="${server.config.dir}/lib"/>
     <library id="DerbyLib">
@@ -36,4 +36,3 @@
     </dataSource>
     
 </server>
-