Spec for message model, couple fixes on that model.