Showcase fixes