A few mock-up changes