Fixes to logging modifications