Fix Ndex-194 and first part of Ndex-144