Build option parsing fix