Compat cleanups