Some schema fixes
Import fixes