Fix ResolveAssets