Some work on ARM support