Small Final Fixes For Demo