Fix more scope issues
Fix more scope issues

jangouts/jangouts,aitnasser/jangouts,jangouts/jangouts,jangouts/jangouts,ChrisBr/jangouts,aitnasser/jangouts,ChrisBr/jangouts,ChrisBr/jangouts,aitnasser/jangouts,ChrisBr/jangouts,jangouts/jangouts,aitnasser/jangouts