more hand-tested compat updates