Fixing a lot of gateway return update status issues.