Fix some 'may be uninitialized' errors.