more arm fixes.