Changed to use latest gaia and gecko