Minor logging improvements