A few little logging tidy ups