Agent zone support fixes