Minor logging improvements;