diff --git a/startup.script_common b/startup.script_common
index 5f2724e..52af519 100644
--- a/startup.script_common
+++ b/startup.script_common
@@ -136,8 +136,9 @@ require "utilities", getenv("utilities_VERSION")
 require "misc", getenv("misc_VERSION")
 
 # caPutLog
-#epicsEnvSet "EPICS_CA_PUT_LOG_ADDR", "gfa-syslog:1515 sf-logstash.psi.ch:1515"
-epicsEnvSet "EPICS_CA_PUT_LOG_PREFIX", IOC
+#putenv "EPICS_CA_PUT_LOG_ADDR=gfa-syslog:1515 sf-logstash.psi.ch:1515"
+sprintf STRINGBUFFER, "EPICS_CA_PUT_LOG_PREFIX=%s",IOC
+putenv STRINGBUFFER
 require "caPutLog", getenv("caPutLog_VERSION")?getenv("caPutLog_VERSION"):"ifexists"
 
 # IOC monitoring
@@ -147,7 +148,7 @@ require R3_13||R3_14?"iocmon":"iocStats", getenv(R3_13||R3_14?"iocmon_VERSION":"
 require "M48T37", "ifexists"
 
 # Database Upload
-require "iocinfo", getenv("iocinfo_VERSION")
+require "iocinfo", getenv("iocinfo_VERSION")?getenv("iocinfo_VERSION"):"ifexists"
 
 # Sequencer for backward compatibility with missing dependencies
 require "seq", R3_13||R3_14?"2.0":"none"