fix a couple of minor hiccups in the GA code
Merge remote-tracking branch 'github/master'