Ensure that integer parameters are treated properly
Removed double-set options

Signed-off-by: achbed <github@achbed.org>