[ARM] Fix several state persistence bugs