More options fixes
More option fixes