Add server close, other fixes
Merge branch 'proxy'

* proxy:
  Add server close, other fixes