LOGMGR-83 and LOGMGR-85 fixes