Various touchups before big overhauls of background functionality