Fixed provisioning script reference.
Fixed a few conflicts.