Fix charset #2 and fix versions