Bug Fixes for the screen system.