SetMsgContainer and bug fix