Added the alert boxes in places that were missed