Minor improvements to background tasks