Fixed some option parsing.