A couple of fixes for the logger