Update fixes

Copy fixes for gtalk from grit96:master  to wollac11:master