Fixes for proper rendering using Linaro 4.9