Fixes and cookies for messages