Few tweaks for armv6 support