Fix up compatibility