some fixes in imports and dependencies