Arm blade  bugfixes

Fixed #2559
Fixed #2570 (fairly high-priority)