fixing some more import errors