Customer and routes fixes