arm: fix bugs in the last commit
3 files changed