Bugfixes: No duplicated imports, fixes imports in stdlib