Fixed some TODO toasts