Adding inbound endpoint related fixes.