more file encoding fixes