Adding seetings for MarshalConfig
Fixing object stuff fixup
AutoFix