Localize imports
Fix types