fixes for customer