Some reworks for GApps