Updates for puppet 3.2 compatability && some fixes