Another round of updates for mockups.