Fix some arm issues