[GAIA] - Final lint fixes