Fix more str/bytes issues