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