Fixing some encoding issues