a few more updates for imports