Enable and fix UTF-8 encoding comments