Even more str->bytes changes