Fix double escaped patrol token

* Caused "Bad token" errors.
* Minor clean up