Logging imrpovements