Need to force UTF-8 in two places