Small updates and a collectd example