Fix some missing option declaration

Missing decleration and cosmetic.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>