Fix imports from git