Showcase and other fixes