EMI: address review commits for pull-request