fixes for patches in bugs 760876 and 860672