More work on ARM support