Mockup bugfixes