Minor params re-order