New version with more code page fixes