Some translation and encoding fixes