Fix some wrong ordering.