some fixes for the showcase