Fix some issues in the puppet provisioning