Fix for recent libraries and tools