More tweeks to server restart