ObjectSetting fixes