Fix server shutdown
Make remote master fully functional