Use Add() instead of addi() where appropriate