A few internal changes to make it easier to add or remove new compats