binary compat fixups