Fix params where we have standardized off and on