Small fixes to screen config