React to options changes

Samples weren't fixed in the dev branch I guess.