MSINM-84: Minor clean-up