Minor logging enhancements