further import fixes