More compiler fixes

Change-Id: I1650f5b4f3619ce777c11dd79a85fe2e66949630