Some minor logging enhancements