Updates to msp_helper.