Screen 4 fixes