Fixed more toasts

cheers