Fixed errors on linaro 4.7