Final schema fixes