Minor schema updates