Support some older libraries until all issues are handled