Fixes for uninitialized variable warnings.