Fix customer scenarios