Fixes for Logger