Fix Werror=uninitialized errors... lazily

Change-Id: If7a8dca054ef380941a9538fe4092ff8549ee7ed