Fix type calculations of + (add)