Fix unicode related issues once and for all
Minor unicode fixes
Normalize buffer names