Fixes to uninitialized vars