Added configuration defaults and attempted to fix NPE on agents