fix bad imports that are breaking the master