More logger fixes