Changes to ensure puppet runs