fix CIDs 10850-52, 10857, 10859-60, 10863, 10869-76