Kaskade: Small Patch

Fixing some minor bugs.