Fix some input value oddities.
Merge pull request #108 from jharding/107-fix-input-value-oddities

Fix some input value oddities