Fix lost imports for new schemas