Fix puppet apply issues.