More fixes for tlldischarge