Misc defaults offthread

Couple quick changes per JIRA discussions
cc: @leskowicz