Fix most of the cyrlic problems