Alert messages fixed