Minor enhancements for SessionTokens