[GAIA BUG997599] - nit fixes