Update Issue 6

Fix to avoid hanging
Update Issue 8

Backport to TelScale

(cherry picked from commit d32739025bc9cb74c53a0246c2dbf1a7799f2a0a)
Fixes Issue 5