Customer token fixes