Mockup validation bug fixes