Fixing puppet issues