Fixes to options parsing.