Fixed problems with encodings and names