some fixes
Merge pull request #371 from my-personal-forks/ga-fixes

some fixes