Tweaking imports and dependencies