adding fixes made for nems demo