Fix the defaults
Merge pull request #59 from sposs/AgentFixes

Fix the defaults