Fix size and order dependencies