fix endpoint-address, global-endpoint-property a/c Wendy's comments