More binary fixup