Some minor uninitialized variable cleanups