- Fixing deferred call type computation
 - Cosmetics in thread