Fixes to logger