Couple of logging fixes