Toasts fixes, comment (policy warning)