Long standing options bug

Incorrect handling of non zero defaults.  Pre-dates the options
refactoring
Log limit option