Some more logging changes