Schema: more fixes.