MSINM-84: Minor fixes