some fixes to import errors