Even more compat fixes.