Options fixes and reset fix