Compatibility tool fixes & enhancements.