BS3/BS2 compat fixup