few issues fixed for Token