Screens tweaks and a scheduler bug fix