Fix config defaults
Fix defaults some more