Additional cleanup, fix multiple messages