Fix spec failures

MSP-9228