Minor changes to the threading model

See title