Fixed messages more

Still getting random "undefined" messages, but they're rare