[GAIA BUG984584] - Lint fixes