Minor logging improvements
Minor logging improvements