Fix grb expansions