Cleanup compat

Fixes #1699