Additional logging changes