Background bugfixes