TBH you should hard stop on errands and temptations. Just set aside time on the calendar for them and keep it in sync with your flow. These can be very damaging to productivity since they are disruptive.