Fix mockups