Fixed a few escort errors