Improvements to message passing for GetTokenForLog