Some 2.11-related updates

Hi Mark,
Please find enclosed some updates for sbinary, which improve 2.11.x compatibility. I am not certain about b475012b402bc3b89650fd3d97a8ccfd8718cf70, but the rest should be ok. Kindly review the pull request, and pick/change as appropriate.
Thanks,
Toni