flo: misc updates for linaro and cleanup