screen 4 fixes