Fixes for screen 4