Fix build errors on uninitilized vars

Change-Id: Iba46bcf595731b1b18177d61cc645bbc731e9ba6