more schema fixes