A few minor tweaks to add screen.