More changes to fix Ndex-142.