Some tweaks for logging integration.
Merge branch 'Kris_Logs' into develop