Patches to make sure rebuilding screen is cleared.