Some mockup fixes