ID and encoding changes/bugfixes