fixes from Gaia's feedback