Add partial compat