Some logging fixes/additions