Minor fixes to logging