some schema fixes