Assorted compatibility updates

Set of updates to make it easier to use this adapter with a shim