Puppet 3.0 support and general fixes