WIP: fix compile errors

Change-Id: Ib5bc1e89adb17f9b31af8eea588542328c0b6dbd
WIP: some comp issues are fixed

Change-Id: Ic10e0d1429e359f966d7f06790acdcb6805765f3
WIP: more comp issues fixed

Change-Id: I28ecf0a42efdce405b418a64951e194f24642776
WIP: it is compiled now

Change-Id: Iba3a8653bad79f49dc9af8c3d65649a372ae5fff