Fixed how defaults are applied to avoid having defaults overriding the actual configs