Fix SIGSEGVs and make NOTIFY=success work.