Fixes for local option parsing