Transfer my fixes from sat_estate into globe_estate