Make Gembuild friendly