Fix wrong encoding
Fix more issue