fix some gaia accessed bugs.