Fix all code instances of FRIENDS and ESCORT flags