Added some missing NULL initializations