Server and binder behave similarly - minor refactorings