Options fixes and reset fix

Do we need to pass in `params` at all?