- Fixes from final showcase