Demo Fixes