diff --git a/sim/warlock/rotations.go b/sim/warlock/rotations.go
index d03c3f587..d51774fe9 100644
--- a/sim/warlock/rotations.go
+++ b/sim/warlock/rotations.go
@@ -68,7 +68,8 @@ func (warlock *Warlock) tryUseGCD(sim *core.Simulation) {
 			warlock.AmplifyCurse.Cast(sim, sim.GetPrimaryTarget())
 		}
 		if sim.Duration-sim.CurrentTime < time.Minute {
-			if sim.Duration-sim.CurrentTime > time.Second*30 && !warlock.CurseOfAgonyDot.IsActive() {
+			// Can't cast agony until we are at end and both agony and doom are not ticking.
+			if sim.Duration-sim.CurrentTime > time.Second*30 && !warlock.CurseOfAgonyDot.IsActive() && !warlock.CurseOfDoomDot.IsActive() {
 				spell = warlock.CurseOfAgony
 			}
 		} else if warlock.CurseOfDoom.CD.IsReady(sim) && !warlock.CurseOfDoomDot.IsActive() {
diff --git a/sim/web/main.go b/sim/web/main.go
index ade392d37..a5b751043 100644
--- a/sim/web/main.go
+++ b/sim/web/main.go
@@ -59,14 +59,15 @@ func main() {
 			body, err := ioutil.ReadAll(resp.Body)
 
 			result := struct {
-				Tag string `json:"tag_name"`
-				URL string `json:"html_url"`
+				Tag  string `json:"tag_name"`
+				URL  string `json:"html_url"`
+				Name string `json:"name"`
 			}{}
 			json.Unmarshal(body, &result)
 
 			if result.Tag != Version {
 				outdated = 2
-				fmt.Printf("New version of simulator available: %s\n", result.URL)
+				fmt.Printf("New version of simulator available: %s\n\tDownload at: %s\n", result.Name, result.URL)
 			} else {
 				outdated = 1
 			}