use guard_compat + multiple fixes