Tweaked the config so things work out of the box