Fixes a few more cases of bug #1, mostly relating to moving onto an empty screen.