[GAIA BUG997599] - nit fixes
Merge pull request #349 from michalbe/Bug997599-temp

[GAIA BUG997599] - nit fixes