Some changes to LeaderClient and CoreServer to manage threads better