Fix compiling issues

Change-Id: Ia048b54ba911214001648c1409a895693e5a7b03