Fix run_puppet script and make bootstrap slightly cleaner