Correct some elements (closes #4362, closes #4363)

Compare current definition with db def