More code page fixes