Schema and encoding tweaks