minor adjustments to schema loading