Fix some missing option declaration

Missing decleration and cosmetic.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
Merge pull request #112 from leseb/fix-options

Fix some missing option declaration