Minor updates / changes to defaults.