Some minor changes to the default options