Agent fixes