Minor encoding changes