Fixes to the arm software.