Fixed dependeny warnings, `endpoints` method.

This resolves some issues I had upon upgrading to the latest code.

@guenter @ssorallen