React to options changes

yeah probably, so I didn't fix them as part of the build break fix.  But I would for sure notice samples not working in my working branch :)