direct import fix bugfixes