Fix options recognition
Fix most of options