Fix possible compatibility issues with 138.* builds