Gaia linter fixes