Updated alerts with fix from JCU