Bug fixes for Token commit