fixes for dbg builds in patches for bug 760876