Further changes to defaults