Fixes for Logger
Logger fixes
More Logger fixes
Merge branch 'LoggerFix'