Fixed more file encoding issues