Some logging related changes