Various schema fixes