Patch to address comments received during NFVSOL#68

Change-Id: I28eff3e9c305fe6961c204727dc9bb3158edfbbc