diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp
index 5093cb4c..ed887bb0 100644
--- a/src/lib/ebus/data.cpp
+++ b/src/lib/ebus/data.cpp
@@ -1339,7 +1339,7 @@ result_t DataFieldSet::write(istringstream& input,
 
 void DataFieldTemplates::clear()
 {
-	for (map<string, DataField*>::iterator it=m_fieldsByName.begin(); it!=m_fieldsByName.end(); it++) {
+	for (map<string, DataField*>::iterator it = m_fieldsByName.begin(); it != m_fieldsByName.end(); it++) {
 		delete it->second;
 		it->second = NULL;
 	}
@@ -1368,7 +1368,7 @@ result_t DataFieldTemplates::add(DataField* field, bool replace)
 result_t DataFieldTemplates::addFromFile(vector<string>::iterator& begin, const vector<string>::iterator end, void* arg, vector< vector<string> >* defaults, const string& filename, unsigned int lineNo)
 {
 	DataField* field = NULL;
-	result_t result = DataField::create(begin, end, this, field);
+	result_t result = DataField::create(begin, end, this, field, false, true, false);
 	if (result != RESULT_OK)
 		return result;
 
diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h
index 948142e2..7b4e1489 100644
--- a/src/lib/ebus/data.h
+++ b/src/lib/ebus/data.h
@@ -154,14 +154,15 @@ public:
 	 * @param templates the @a DataFieldTemplates to be referenced by name, or NULL.
 	 * @param returnField the variable in which to store the created instance.
 	 * @param isWriteMessage whether the field is part of a write message (default false).
-	 * @param dstAddress the destination bus address (default @a SYN for creating a template @a DataField).
+	 * @param isTemplate true for creating a template @a DataField.
+	 * @param isBroadcastOrMasterDestination true if the destination bus address is @a BRODCAST or a master address.
 	 * @return @a RESULT_OK on success, or an error code.
 	 * Note: the caller needs to free the created instance.
 	 */
 	static result_t create(vector<string>::iterator& it, const vector<string>::iterator end,
 			DataFieldTemplates* templates, DataField*& returnField,
-			const bool isWriteMessage=false,
-			const bool isTemplate=true, const bool isBroadcastOrMasterDestination=false);
+			const bool isWriteMessage,
+			const bool isTemplate, const bool isBroadcastOrMasterDestination);
 
 	/**
 	 * Dump the @a string optionally embedded in @a TEXT_SEPARATOR to the output.