Fix problem with puppet dependency cycles