Fixed most of the reordering warnings