Fix options parsing