Fix one Wunitialized and related cleanups