more compat changes