tweaks for go-live