Fix options parsing for non-execute commands