Fix clang 9 missing-field-initializer warnings