The pieces of logging changes that I split out manually