Fix imports for fresh install