more import fixes