Fix wrong registration in service locator.
Improve resource server configuration.