Fix some issues with Draft and unexpected alerts.