More puppet updates