diff --git a/server_build/docker_build/Dockerfile.imaserver b/server_build/docker_build/Dockerfile.imaserver
index 2df936b1..6922a9c4 100644
--- a/server_build/docker_build/Dockerfile.imaserver
+++ b/server_build/docker_build/Dockerfile.imaserver
@@ -42,8 +42,6 @@ RUN yum -y upgrade && \
     yum -y install gdb net-tools openssh-clients openssl tar perl jansson zip logrotate bzip2 unzip && \
     rpm -iv http://10.90.125.123:9988/RPMS/${IMA_PKG_SERVER}.rpm
 
-RUN python /usr/share/bin/monitor.py &
-
 #Uncomment below USER line to run as a non-root user (but do the above steps 1-4 as well!)
 #USER ima:ima
 
diff --git a/server_build/docker_build/Dockerfile.localRPM.imaserver b/server_build/docker_build/Dockerfile.localRPM.imaserver
index b92fe0d6..91f89930 100644
--- a/server_build/docker_build/Dockerfile.localRPM.imaserver
+++ b/server_build/docker_build/Dockerfile.localRPM.imaserver
@@ -51,7 +51,7 @@ RUN yum -y install /tmp/imaserver.rpm
 # Delete imaserver.rpm from temporary directory
 RUN rm -f /tmp/imaserver.rpm
 
-RUN yum install -y python3
+RUN yum install -y python3 python3-pip
 
 ADD ./requirements.txt /tmp/
 RUN pip3 install --upgrade -r /tmp/requirements.txt && \
@@ -65,8 +65,6 @@ RUN sed -i "/HA.AllowSingleNIC/d" /usr/share/amlen-server/config/server.cfg && \
     echo "HA.AllowSingleNIC = 1" >> /usr/share/amlen-server/config/server.cfg && \
     echo "HA.SplitBrainPolicy = 1" >> /usr/share/amlen-server/config/server.cfg
 
-RUN python /usr/share/bin/monitor.py &
-
 #Comment out the line below to run as root user
 USER ima:ima
 
diff --git a/server_tmsmsgtool/src/com/ibm/ism/tools/msg/tms/ISMTMSManager.java b/server_tmsmsgtool/src/com/ibm/ism/tools/msg/tms/ISMTMSManager.java
index 50957a6c..0a0fff1c 100644
--- a/server_tmsmsgtool/src/com/ibm/ism/tools/msg/tms/ISMTMSManager.java
+++ b/server_tmsmsgtool/src/com/ibm/ism/tools/msg/tms/ISMTMSManager.java
@@ -452,7 +452,8 @@ public boolean saveXMLDocument(String fileName, Document doc) {
 				.newInstance();
 		try {
 			transformer = transformerFactory.newTransformer();
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+                        //this causes problems in java 11
+			//transformer.setOutputProperty(OutputKeys.INDENT, "yes");
 			transformer.setOutputProperty(OutputKeys.METHOD, "xml");
 			transformer.setOutputProperty(OutputKeys.ENCODING, "utf-8");