Further logging fixes (thanks to Thorsten Glaser)