Code review changes to fix missing default ctor initialisation