Some fixes
Sanity check the existence of agent source