fixed compat issues