Minor mockups fixes