Fixes to pass private agents tests