Fixed reordering warnings