Fixing up some messages stuff. Fingers crossed!