Fixing VARDIFF and POOL_TARGET for nvc support