Fixing from import references