[BUGFIX] Change default values for some fields

Change-Id: I52d4c46ba751778fa82e2964b0c67de5e8eb61f2