more compat fixes