Making sure that all default properties are set for every payload
Remove 3.6 compat cruft