Fixed some puppet issues