Some logging changes