Added fixes and default to allow this to run in the preproduction environment