Some Mockup adjustments after the recent prs.