Set some defaults early

Implements idea from issue #1664