Add config defaults missed from latest merge