Minor schema fixes