Compatibility with revised libs