Made some updates to fix minor problems

issue: A24Group/Triage#6161