Fixes yet more importing errors