Compilation bug fixes

Change-Id: I5cdbe26ddb8fe55e97ca52cbfb70de5208b41390