Fix Compile more compile Errors opps...

Change-Id: I61fa6d3f5f7e1fea45a9b1b0ea5d013b54bcfb84