linaro 4.8 fixups
more linaro fixes