Fix command-line options parsing