Move compat into the same file!