Some fixes for customer synchronization