Continue fixing bytes vs. unicode