Tweaks for threading model