Reorder some parameters for consistency