More string/binary fixes