Changed settings to support datadog. Fixed bugs.

Signed-off-by: robertomorati <robertomorati@gmail.com>