Minor updates for go-live