SVP: fix ARM breakage, re-add missing stuff