Some logger fixes