Fixed option parser bugs