more compat changes...