Fixing service order dependencies