Log message enhancements and minor cleanup