20517: Fix data errors detected by checkitems and checkeffects

Top