Some changes in opt parsing