More tweaking of defaults