Even more background fixes