Fix options parsing errors