fixes to puppet bootstrap