Fixing (hopefully for the last time) encoding issues.