Make defaults work

Some minor changes to make the defaults work with a minimal config.