Fixing little encoding issues