Fix bugs for the edit/create alarm