final fixes (Now Building!)

Change-Id: I803f677c8622f930404ddc2b2354a41dfb7d001c