Fixed up ARM support