Puppet Demo Fixes