Options related fixes