Don't instantiate threads directly in two more places