Fix stop and restart issues with similar named servers (bug #12)