fix two more definitions in samples directory
fix agent
Merge branch 'unified-builtins2' into samples
Merge pull request #582 from dwightguth/samples

Samples