Small logging fixes