Some logging fixes / additions