More str->bytes changes