Fix some wrong ordering.
Run also on slaves.