More adjustments on logging