fix compat issues