Minor fixes to work well in screen