Minor tweaks to handling of customers