Fix envelope object. And msg.router.end