final fixes for go-live