First fix in import repo classes