Fixed issues with push agents