Attempt to fix encoding issues