Fixes for option parsing