Move enforce utf-8 encoding further in