Bugfixes for change token.