A couple of adjustments for logging