small changes for go-live