NXIO-353: Minor fixes due to recent upgrade