Adapt specs to encoding changes