Issue #2229343: Fix for fixed targeting info getting clobbered on option set save, plus some other minor fixes and cleanups