Compat fixes
more