fixes for imports and usages