Fixed wrong enconding
More fixes