diff --git a/BlockServer/runcontrol/runcontrol_manager.py b/BlockServer/runcontrol/runcontrol_manager.py
index fb474d2f..f0ec38ea 100644
--- a/BlockServer/runcontrol/runcontrol_manager.py
+++ b/BlockServer/runcontrol/runcontrol_manager.py
@@ -61,11 +61,10 @@
 def create_db_load_string(block):
     load_record_string = 'dbLoadRecords("$(RUNCONTROL)/db/{file}.db", "{macros}")\n'
     # PVA is PV Alias, NA is NoAlias
-    macro_string = "P=$(MYPVPREFIX),PV=$(MYPVPREFIX)CS:SB:{pv},PVA=$(MYPVPREFIX)CS:SB:{pva},NOALIAS={na},NOARCHIVE=$(NOARCHIVE=)"
-    if block.name == block.name.upper():
-        return load_record_string.format(
-            file="runcontrol", macros=macro_string.format(pv=block.name, pva="", na="#")
-        )
+    macro_string="P=$(MYPVPREFIX),PV=$(MYPVPREFIX)CS:SB:{pv},PVA=$(MYPVPREFIX)CS:SB:{pva},NOALIAS={na},NOARCHIVE=$(NOARCHIVE=),PINI=YES"
+    if (block.name == block.name.upper()):
+        return load_record_string.format(file="runcontrol",
+                                     macros=macro_string.format(pv=block.name, pva="", na="#"))
     else:
         return load_record_string.format(
             file="runcontrol",
diff --git a/DatabaseServer/database_server.py b/DatabaseServer/database_server.py
index 07665252..955f678f 100644
--- a/DatabaseServer/database_server.py
+++ b/DatabaseServer/database_server.py
@@ -149,29 +149,19 @@ def generate_pv_info() -> dict:
         Returns:
             Dictionary containing the information to construct PVs
         """
+        pv_size_1m = 1000000
         pv_size_256k = 256000
         pv_size_10k = 10000
         pv_info = {}
 
-        for pv in [
-            DbPVNames.IOCS,
-            DbPVNames.HIGH_INTEREST,
-            DbPVNames.MEDIUM_INTEREST,
-            DbPVNames.LOW_INTEREST,
-            DbPVNames.FACILITY,
-            DbPVNames.ACTIVE_PVS,
-            DbPVNames.ALL_PVS,
-            DbPVNames.IOCS_NOT_TO_STOP,
-        ]:
+        for pv in [DbPVNames.IOCS, DbPVNames.HIGH_INTEREST, DbPVNames.MEDIUM_INTEREST, DbPVNames.LOW_INTEREST,
+                   DbPVNames.FACILITY, DbPVNames.IOCS_NOT_TO_STOP]:
             pv_info[pv] = char_waveform(pv_size_256k)
 
-        for pv in [
-            DbPVNames.SAMPLE_PARS,
-            DbPVNames.BEAMLINE_PARS,
-            DbPVNames.USER_PARS,
-            DbPVNames.MOXA_MAPPINGS,
-            DbPVNames.NUM_MOXAS,
-        ]:
+        for pv in [DbPVNames.ACTIVE_PVS, DbPVNames.ALL_PVS]:
+            pv_info[pv] = char_waveform(pv_size_1m)
+
+        for pv in [DbPVNames.SAMPLE_PARS, DbPVNames.BEAMLINE_PARS, DbPVNames.USER_PARS, DbPVNames.MOXA_MAPPINGS, DbPVNames.NUM_MOXAS]:
             pv_info[pv] = char_waveform(pv_size_10k)
 
         return pv_info
diff --git a/server_common/loggers/isis_logger.py b/server_common/loggers/isis_logger.py
index 288de550..86936e65 100644
--- a/server_common/loggers/isis_logger.py
+++ b/server_common/loggers/isis_logger.py
@@ -80,7 +80,7 @@ def write_to_log(self, message, severity="INFO", src=None):
         """
         if src is None:
             src = self._ioc_name
-        msg_time = datetime.datetime.now()
+        msg_time = datetime.datetime.now(datetime.timezone.utc).astimezone()
         IsisLogger.executor.submit(
             self._queued_write_to_log,
             message,
diff --git a/start_blockserver.bat b/start_blockserver.bat
index 80e6f33b..ae6c5293 100644
--- a/start_blockserver.bat
+++ b/start_blockserver.bat
@@ -2,7 +2,7 @@ REM @echo off
 setlocal
 set MYDIRBLOCK=%~dp0
 call %MYDIRBLOCK%stop_blockserver.bat
-set CYGWIN=nodosfilewarning
+set CYGWIN=disable_pcon
 call %MYDIRBLOCK%..\..\..\config_env_base.bat
 
 set EPICS_CAS_INTF_ADDR_LIST=127.0.0.1
diff --git a/start_database_server.bat b/start_database_server.bat
index 28b7935a..96f2cd92 100644
--- a/start_database_server.bat
+++ b/start_database_server.bat
@@ -2,7 +2,7 @@ REM @echo off
 setlocal
 set MYDIRBLOCK=%~dp0
 call %MYDIRBLOCK%stop_database_server.bat
-set CYGWIN=nodosfilewarning
+set CYGWIN=disable_pcon
 call %MYDIRBLOCK%..\..\..\config_env_base.bat
 
 set EPICS_CAS_INTF_ADDR_LIST=127.0.0.1