compilation fixes

Change-Id: Ifdb2e1e440b4385d2463f178dbfef9b5c908cba1