Fix a bug in getting the options
Fix also the makefile