Minor interaction tweaks, prevent showing some Toasts