Finish fixing binary compatibility