Small fixes to make generic puppet deployment work