recently discovered compat fixes