Fixed toast messages-ish