Fixes for escreen additions.