fixed up issues "linaro 4.8 fixes" caused