Bug fixes and amends as part of go-live