Improves the agent signal manager a bit

Change-Id: Ie737c690601f013c0632673e07badbc9d037e733