Build Fixes and oops

Change-Id: Ic8ff3ab3b1b40603289b0925e1246405a1605ec9