Fixes some regressions that crept in by larger refactors in the past and only occurred with multiple screens.