Wrong type of opt, fix #1
-Wconversion added
Typo in guard macro
Type conversion fixes according to -Wconversion