Changes so that we can build egg using XStatic