bug910403: Added fix's to endpoint