diff --git a/Dockerfile b/Dockerfile
index 7dee779a3..db9675217 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:22.04 as builder
 ENV DEBIAN_FRONTEND=noninteractive
 
 
-RUN apt update && apt install -y wget git unixodbc-dev libgtk2.0-dev xvfb sqlite3 libsqlite3-dev build-essential
+RUN apt update && apt install -y tzdata wget git unixodbc-dev libgtk2.0-dev xvfb sqlite3 libsqlite3-dev build-essential
 
 # Download and build OpenSSL 1.1.1w
 WORKDIR /tmp
@@ -15,6 +15,11 @@ RUN wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz \
     && make test \
     && make install
 
+RUN ls -la /usr/local/lib/
+
+# Set the timezone
+RUN echo "UTC" > /etc/timezone
+
 RUN apt update && apt install -y wget git unixodbc-dev libgtk2.0-dev xvfb sqlite3 libsqlite3-dev && \
     cd /tmp && \
     wget https://dev.mysql.com/get/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.26-linux-glibc2.12-x86-64bit.tar.gz && \
@@ -33,7 +38,7 @@ WORKDIR /work/fhirserver
 COPY . /work/fhirserver
 
 RUN /work/bootstrap/linux-libraries.sh /work/bootstrap
-RUN cp exec/pack/linux/*.so /usr/lib/
+RUN cp /usr/local/lib/*.so* /usr/lib/
 RUN /work/fhirserver/build/linux-fhirserver.sh /work/bootstrap
 RUN cp exec/pack/*.properties exec/64
 
@@ -42,6 +47,8 @@ ENV PORT 80
 ENV TERMINOLOGY_CACHE /terminology
 VOLUME /terminology
 
+ENV DEBIAN_FRONTEND=
+
 RUN printf '#!/bin/bash \n\
 Xvfb  :99 -screen 0 1024x768x8 -nolisten tcp & \n\
 echo "[web]" > /work/fhirserver/exec/64/web.ini; \n\
diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi
index 5040b89f9..9c782a18d 100644
--- a/toolkit2/fhirtoolkit.lpi
+++ b/toolkit2/fhirtoolkit.lpi
@@ -124,7 +124,6 @@
             <CompilerMessages>
               <IgnoredMessages idx5024="True"/>
             </CompilerMessages>
-            <Compiler>-O2 -Xs</Compiler>
           </Other>
         </CompilerOptions>
       </Item>