more logging fixes