More str/bytes fixes.
3 files changed