Minor change to execution contexts: use background more places