Fixes to make ScreenImage type NOT hardcoded.