Cure more uninitialized warnings