fix the configuration_edit_object macro (because of one file contains several definitions)
fix errors