Various minor style/logging fixes