Couple of logging fixes
Merge pull request #87 from markewallace/LoggingFixes

Couple of logging fixes