Minor logging fixes