Fix passing global options