Various fixes and upgrades for schema and namespaces.