Minor edits to some of the defaults