Fix Savannah bugs #35313 and #33102.